From 5714507c42a6a9fcdd8b7dc415d181a3cf96418d Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 11 Oct 2020 21:34:17 +0100 Subject: [PATCH] javadoc-optional Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gbp-Pq: Name javadoc-optional.diff --- Repository.mk | 2 +- configure.ac | Bin 483299 -> 484027 bytes odk/CustomTarget_check.mk | 2 +- odk/Module_odk.mk | 6 ++++-- odk/util/check.pl | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Repository.mk b/Repository.mk index 38fd2475e20..0718b51c8db 100644 --- a/Repository.mk +++ b/Repository.mk @@ -865,7 +865,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ offapi_idl \ udkapi_idl \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ odk_unowinreg \ ) \ diff --git a/configure.ac b/configure.ac index 4840cf59fbbc84850f8718f3947cef66247e8a64..dc0dcbd04591ddeac5084a323d260bcad0603965 100644 GIT binary patch delta 558 zcmZXRK}Zx)7{_@#-H>-(@akC5ziGONH_)mnA|ujxCp+L2QC` z;dz|JLh4tVr8^Jeay>nVu}^0!GgHl^!Dn7Mx6p8ztjKD^Ro?Bk+P!((Ipr1dcjvsR z;`BpY{!X1JZE%i1zm;}0K9InV7E0mc2G_9eM51Bbqh&P#MbHKG3%ZD*bBxdtQFIgq zoyHeV8r}#xiO;6wwrgYrM#q71I_j59LNy>tW#UjxYQvo?vU%2|^GGCRqq?J50b=;` zddeRX8tlD@hVFeu;JrzGK>+!m1TD4^p=MGN-4oKL+E5N9Zc#6GIko#sruKT1R9v@c z0NYHO&s!A7;!X9~K-n|&;Da6)%3j6J4&NHSIyPeH_h%3GCogYKBL5M1Yf+}JiI3j6 pmX%YEJ!m^}$Id0YGUF8t{a;V%g_kXqS*Tkii_211>sFM;{{q*vsJZ|E delta 217 zcmdmeRQBfzCwyR*nBL9D zVle$JAB*vH6@DN~>N~U0^elcBndt(5m|3Pf2(qwDpTy51K0V5kMPzz^A`92_hHpTL zIeaWa)6I>Uq^GkAut-lX$mg4GCct7iJ;H#UfBHT*7TxK)1z2p64B-%Dk({p2%fb&b zQ+ImVPey_1y@Eg`mp~F~3t0K5y9lvJPw!=AW1sHt!!FjoU5EvUS%H{s`*tCAmH+@g Cr9v72 diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index b9dc8d35807..d3b8fc31109 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg)) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 410f8cf8ef1..363a8a41dea 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ $(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ GeneratedPackage_uno_loader_classes \ $(if $(filter WNT,$(OS)),Library_unowinreg) \ Package_unowinreg \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index be03d40ff58..bed51e1c7a6 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -184,7 +184,7 @@ if (-d "$SdkDir") { # improvement required my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; - if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { + if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") { print "check java docu: "; if (check_dir("docs/java/ref")) { if (!check_file("docs/java/ref/index.html")) { -- 2.30.2